bitkeeper revision 1.1012 (40dabc774KHZDbPvbtWWNX1C-LNl5Q)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 24 Jun 2004 11:35:19 +0000 (11:35 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 24 Jun 2004 11:35:19 +0000 (11:35 +0000)
commit787f3191469c48fe1801f33438571654f778ad9e
tree378af1e8041e399d3ba636b4d6942e2b018e5fb2
parentb41a11b189312f5a249e55ecad64b0e03d2268e3
parent24090828bdd7695c202ece69bc75723963d9dd5f
bitkeeper revision 1.1012 (40dabc774KHZDbPvbtWWNX1C-LNl5Q)

manual merge
tools/xc/lib/xc.h
tools/xc/lib/xc_domain.c
tools/xc/lib/xc_linux_save.c
tools/xc/py/Xc.c
xen/common/shadow.c
xen/include/asm-x86/processor.h
xen/include/hypervisor-ifs/dom0_ops.h
xen/include/xen/shadow.h